Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:09:39 +0000 (10:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:09:39 +0000 (10:09 -0700)
commit1c70e8b8e8062c7a3f857ca8dea9b7112cdec1e6
tree91fbf2ee71e0f99ccc0e971987bff653d7aba7b9
parent3f9ce2e593d7ed87f1a70f94973474b3835fc837
parent0ae051dbebe4033598456f85d0e8ecadf3fe4f39
Merge from trunk.